Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Replace all remaining six usage with native Python 3 equivalents #7704

Merged
merged 12 commits into from
Jun 16, 2020

Conversation

ilmari
Copy link
Contributor

@ilmari ilmari commented Jun 15, 2020

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
  • Pull request includes a sign off
  • Code style is correct (run the linters)

ilmari added 5 commits June 15, 2020 22:33
Use native Python 3 `int`/`bytes`/`str` instead.

Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
In Python 3 the exception carries its own traceback,
so no need to explicitly preserve it.

Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
Signed-off-by: Dagfinn Ilmari Mannsåker <ilmari@ilmari.org>
@clokep clokep self-assigned this Jun 15, 2020
@clokep clokep self-requested a review June 15, 2020 21:47
changelog.d/7704.misc Outdated Show resolved Hide resolved
@clokep clokep self-requested a review June 15, 2020 21:48
@ilmari ilmari force-pushed the more-six-removal branch from 4181ba8 to bdbb3a8 Compare June 15, 2020 22:51
@ilmari ilmari changed the title More six removal Replace all remaining six usage with native Python 3 equivalents Jun 15, 2020
Copy link
Member

@clokep clokep left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Thank you!

@clokep clokep merged commit a3f1156 into matrix-org:develop Jun 16, 2020
@ilmari ilmari deleted the more-six-removal branch June 16, 2020 13:13
babolivier pushed a commit that referenced this pull request Sep 1, 2021
* commit 'a3f11567d':
  Replace all remaining six usage with native Python 3 equivalents (#7704)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants